projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ee2af1 71e256b)
bitkeeper revision 1.1159.212.44 (41f77762AXzU93deGpv_Z5doFw4oeg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 26 Jan 2005 10:56:34 +0000 (10:56 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 26 Jan 2005 10:56:34 +0000 (10:56 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
tools/libxc/Makefile patch | diff1 | diff2 | blob | history

diff --cc tools/libxc/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.